Merge.
authorsos22@douglas.cl.cam.ac.uk <sos22@douglas.cl.cam.ac.uk>
Fri, 19 Aug 2005 13:08:50 +0000 (13:08 +0000)
committersos22@douglas.cl.cam.ac.uk <sos22@douglas.cl.cam.ac.uk>
Fri, 19 Aug 2005 13:08:50 +0000 (13:08 +0000)
commit3ba23368d14dfe42f7b87fadb57581c8e3cbc1ba
tree0777e371efa4ae38e47eccf5b49e64aff68e724f
parent4ba5dde55390366f57e6126256e4510b635480c8
parent605d86e2cbcca784d39568d3ece2036107c6206c
Merge.

Signed-off-by: Steven Smith, sos22@cam.ac.uk
linux-2.6-xen-sparse/arch/xen/kernel/reboot.c
linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c